Quality, Class & General touch ups
Merge branch 'master' of https://github.com/nathanielasare/generationflux