Fixed Duplicate Map and Stop List bugs.

Pull request for bug #21.
Also fixes bug #23.