Improving readibility
Merge branch 'develop'