Merge pull request #36 from ckolek/development

master merge
Merge pull request #37 from ckolek/master

Merge pull request #36 from ckolek/development