Bug fixes
Project Cleanup
Merge pull request #48 from mshamash/master

Bug fixes + project cleanup