Revert "Merge master with development"
Merge pull request #48 from dchaplinsky/revert-45-development

Revert "Merge master with development"