Whitespace, consistancy and some slight refractoring.
Added a picture.
Merge pull request #5 from KarlHerler/master

Whitespace & cat
Merge branch 'master' into gh-pages