Merge pull request #22 from jrnold/master

merge back from master