Merge pull request #174 from OneDayStudios/master

Back to Dev branch