Merge pull request #112 from ernstchan/master

merge
Merge pull request #113 from ernstchan/geo-info

Merge pull request #112 from ernstchan/master