Starting to make pretty
Merge pull request #10 from ateich/master

Starting to make pretty