new version with features
Merge pull request #1 from melvilgit/features

features to master