Merge pull request #129 from ihptru/master

finish More from author (maps)