Revert "Merging development to master branch"
Merge pull request #2 from COHRINT/revert-1-master

Revert "Merging development to master branch"