Added some output messages
Merge branch 'dev' into test