Merge pull request #36 from ckolek/development

master merge