Merge pull request #3 from LevEngIntern2014/master

m
Merge pull request #4 from LevEngIntern2014/development

Merge pull request #3 from LevEngIntern2014/master