New POI protocol, some optimizations
Merge branch 'master' of https://github.com/Chiru/WeX