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