Merge pull request #189 from transparencyint/f-connectionRollback

F connection rollback
only removed else
Merge branch 'master' into f-corruptionFlagActors
fixed multiple marker creation