wokr on tutorial
renamed method
Merge branch 'develop' into feature/presentation