BUG: fix some bugs; add some tests
Merge pull request #126 from jakevdp/marker-test

BUG: fix some bugs; add some tests