remove discret function
Merge branch 'master' of https://github.com/NII-APP/NPO