Updated controller, now with tests.
Merge pull request #2 from noeticpenguin/master

Now with tests. Namespace coming.