fixes
Merge pull request #4 from bnb/master

Fixes