updates
Merge pull request #123 from jeremyschulman/master

fix issue 118