testing
drag markers
Merge pull request #20 from elyrly/master

various changes