Added configuration option for fist only
Merge branch 'feature/config' into develop
Merge branch 'develop' into feature/display