Bug #429
Fixed project settings for Bug #429
Merge pull request #538 from TheWizKid95/bugs

Bug #429
Bug #520