Pre-merge commit
Merge branch 'master' of github.com:betteroffnetworks/developer.betteroff.net

Merging in Maurizio's syntax changes