Fix forward/back
Merge pull request #41 from rgrochowicz/master

Fix forward/back