Merge pull request #15 from kostyadubinin/development

See commits messages