fix #23 #81
Merge branch 'master' of github.com:wendal/gor