Merge pull request #7 from raivis-vitols/development