Merge pull request #241 from tykeal/master