Merge pull request #53 from larister/master

Speech & map removal