Improved error handling
Merge branches 'master' and 'errorReporting'
fixed short ints not working
Merge branches 'master' and 'functionDecl'