Updating forward to semi-final state
Merge pull request #184 from darkwing/forward-update-1

Updating forward to semi-final state