Modifications made for supporting Otto 4.0
Merge branch 'master' of github.com:Cronom/otto-samples