Fix errors with future parser
Merge pull request #520 from mhaskel/future_parser_fix

Fix errors with future parser