Merge pull request #4 from jrtew/master

Merging to get this branch up to date.