ok
Merge pull request #21 from twhitloc/master

maybe this time?