Merge branch 'hotfix/fix_first_feature' into develop
Merge pull request #2 from travis2861/develop

Merge branch 'hotfix/fix_first_feature' into develop