more future parser improvements
Merge pull request #113 from CpuID/master

more future parser improvements