Merge pull request 'update feature set' (#94) from feature-set into develop