fixing all the things to make it pretty
merging with master
Merge pull request #63 from danisaurus/prettify

Prettify