Minor Fixes after merge.
Merge pull request #50 from dpradeep/merge-forward

Minor Fixes after merge.