Merge pull request #27 from amy-mac/master

lots of stuff
Dynamic reloading of markers is working