Merge pull request #1 from dhwz/master

Merge from dhwz base