Fix for future parser support
Merge pull request #368 from mhaskel/future_parser

Fix for future parser support