error msgs implementation
merging conflicts
merging code with master
Merge branch 'master' into sachit