Merge branch 'master' of github.com:ndt/ogo-ndt
Merge branch 'master' of github.com:ndt/ogo-ndt