fix
Merge pull request #2 from marsmith/master

fix