Merge pull request #9 from kwhatmough/master

Merge next into master