Bug fixes, started working on object and array literals
Merge remote-tracking branch 'origin/master'