Fixed #531 and Fixed #524 also worked on # 532 worked on # 525 and worked on # 522
Merge branch 'master' of github.com:GabrielDancause/blobon