Merge pull request #11 from raivis-vitols/development