Heading in the right direction
Merge pull request #1 from jenterkin/master

Here ya go