Merge pull request #2 from stilgeki/master

Merge my implementations from his commit since he did the commit for me.