Fixing some errors
Merge remote-tracking branch 'origin/jason' into jason