Merge pull request #2 from richhiggins/master

..
Merge pull request #3 from weaverluke/master

Merge pull request #2 from richhiggins/master