Revert "big merge"
Merge pull request #9 from SoftwareDev/revert-8-git

Revert "big merge"