update .gitignore
Merge branch 'test'
Merge branch 'test'
Update README.md
Edit: marker canvas example
Update README.md
Update README.md
Merge the pull request #124 into the dev branch