handling messages
Merge templating
handling messages
Merge dev-master