Implementing feature-13, improved app configuration
Merge branch 'feature-13' into develop