Merge pull request #5 from raivis-vitols/development