merge conflict
Merge branch 'dev' of https://github.com/snwfog/peerpen into dev
map constuctor