Done, cleaned up
Merge pull request #4 from shaunhaow/testworking

Done, cleaned up