Merge pull request #22 from juancjara/development

Development
Merge pull request #23 from juancjara/development

markers added
Merge pull request #24 from juancjara/master

update dev