Fixed merge confilcts
Merge pull request #15 from pemaxim/development

Fixed merge confilcts