merge  amster
Merge branch 'master' of ssh://github.com/t6847kimo/nctuplus