Added functionality to parser. Shell can now be run.
Merge remote-tracking branch 'origin/master'