Fixed generated data
More Fixes after merge.
Merge pull request #49 from dpradeep/merge-forward

More Fixes after merge.