Cosmetic changes
Integration of the pull request: Develop #2
Merge branch 'ahoa-develop' into develop
merge from upstream