Added beter parsing of timegate/map if supplied, related to #32