added marker functionality and merged local changes