prettyier
Merge branch 'master' into make-pretty
for the sake of travis
Merge pull request #30 from Lowest0ne/make-pretty

Make pretty