User messages improved and implemented in API
Merge branch 'API_Messages'