Markup messages
Merge branch 'master' of https://github.com/madnessxd/almende
Merge branch 'master' of https://github.com/madnessxd/almende