Merge pull request #15 from vonclites/dusty

Dusty
Merge branch 'master' into dusty