Merge pull request #141 from ihptru/master

Legacy map conversion
Merge pull request #142 from ihptru/master

corrections