Merge pull request #21 from seanwolter/master

changed file structure, documented bug, added description method to map and mapper objects