Merge pull request #4 from JackDougherty/master

pull from master