path
changed path
Merge branch 'dev' into gh-pages
changed path
added setView
changed code