recent fixes and uploads
Merge branch 'master' of https://github.com/albaredoreynan/sideproject