Merge pull request #36 from ilya3d/master

map and filter event model
add point to map
Merge remote-tracking branch 'origin/master'
fix map
empty array
fixfixfix