Fixed #366 and worked on #561
Merge branch 'master' of github.com:GabrielDancause/blobon