markers fixed + data display in history
Merge pull request #29 from jskudlarski/master

markers fixed + data display in history