- a few small fixes
Merge pull request #1 from gorrila/proposed_features

- a few small fixes