Beginning to fix scaling issues
Merge branch 'dev' of https://github.com/team3b/Puckt into dev