Feature 4 added
feature 5
Merge branch 'master' into dev