Improved 'success' and 'warning' messages
Merge branch 'hotfixes0.1'