Merge pull request #1 from M66B/master

Pulled on August 7