Merge pull request #112 from brettwooldridge/develop

Minor parser cleanup, and fix for division (/) handling.