Merge pull request #3 from raivis-vitols/development