added marker test code
Merge branch 'client' of https://github.com/edwlook/pickup into client