dahtah Merge pull request #170 from asgr/patch-1