Update features
Merge pull request #352 from grosenbaum/update-features

Update features