fixes
Merge pull request #4 from JacobEdelman/master

fixes