change markers and define text
Merge remote-tracking branch 'upstream/master'
update key
Merge remote-tracking branch 'upstream/master'
Merge pull request #145 from thaives/master

change markers