fix
Merge pull request #76 from marsmith/master

fix