Merge pull request #12 from dcbullock/master