Fixes issue #318. + Fixes code layout. + Uses standard EventMap instead of homemade Timer. --HG-- branch : trunk