Start with proper marker index for each frame. Fixes #107
Merge branch 'develop-107' into mine