johnmyleswhite Merge pull request #15 from crenwick/master