- Fixed bug with return statements
- Better error messages
- Minor clean-up
Merge remote-tracking branch 'origin/master'