Adding wrapper around current position and storing current position in the session
Merge branch 'master' into markers