Added feature #3
Merge branch 'develop' into master
Merge remote-tracking branch 'origin/master' into master2