Merge pull request #60 from Gonthim/master

Finally getting around to implementing some unit tests.