fixed temporal version with awful hack
Merge branch 'master' of https://github.com/robert-schmidtke/map
incorporated comments