Merge pull request #129 from ercchy/master

Some optimization was made
fixing events not showing on map