Merge pull request #1 from genson/new_features

Preparing for new features