fixed merge
Merge pull request #87 from eshem/master

fixed merge