Add: error handling & messages
Merge branch 'master' into build
Grunt build
Improvement: Restructure file organization
Merge branch 'master' into build
Grunt build