Rest of project stuff
Merge pull request #189 from WannabeSid/master

 Rest of project stuff