Some nice features
Merge pull request #8 from christian-schweinhardt/master

New fancy stuff