Minor upgrades. The previously mentioned problems still exist.
Merge branch 'master' of https://github.com/nolliepoper/Temp.git