Merge pull request #12 from kostyadubinin/development

Multiple commits. See Commit messages.