Merge branch 'master' into develop
Adding license statement to internal files
Adding the background color option
Adding the markers feature.
Fixing details for the markers functionality
Fixing detail for markers functionality
Merge branch 'develop'