Merge pull request #6 from Michael-Bell/master

d