Merge branch 'master' into cws
Merge branch 'cws' of github.com:mondora/mondora-extension into cws