Merge branch 'master' of github.com:ffzg/gnt-info