Merge pull request #1 from genson/new_features

Preparing for new features
Merge pull request #3 from genson/master

Merge pull request #1 from genson/new_features