Merge pull request #1 from cdibble/master

>?