Merge pull request #174 from OneDayStudios/master

Back to Dev branch
Merge pull request #185 from OneDayStudios/3.0.0-dev

Merge pull request #174 from OneDayStudios/master