Merge pull request #18 from chris-belcher/master