Merge branch 'master' into develop
Cleaned up the solution, but still a bit messy
Merge branch 'develop'