Merge
U
Fix confict
Merge branch 'master' of https://github.com/nattaphat/hgis
Update and fix conflict