Updating the markers
Merge branch 'master' into markers