Added tests, fucktored a bit.
Merge pull request #2 from pekkis/0.2

Added tests, fucktored a bit.