Merge pull request #2 from richhiggins/master

..