Initial commit of v3.1.0
Add map and modal