All features merged into Ivanseidel's library.
Merge pull request #1 from SomeRandomGuy/master

All features merged into Ivanseidel's library.