Merge pull request #9 from dcbullock/master