Merge pull request #1 from travis2861/feature/First_Feature

First feature
fixed missing things
Merge branch 'hotfix/fix_first_feature' into develop