Some fancyness
Updates
Merge pull request #6 from christian-schweinhardt/master

Fancy shit