Prettyfication complete
Merge pull request #1 from LuRsT/master

Prettyfication