Follow own code standards
Merge branch 'master' of https://github.com/ebkalderon/pixelhedron