Merge pull request #1 from M66B/master

Merging recent changes from parent.