Merge pull request #103 from benilovj/features_documentation