Merge pull request #1 from stwalkerster/master

fix
Merge remote-tracking branch 'hmb/master'