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

Revert "Revert "big merge""