added errors but errors need better formatting - masa
Merge branch 'master' into masa