Merge branch 'release-0.1.3' into develop
changed nextMarker handling
Merge branch 'develop'