Several enhancements for clasification
Merge branch 'master' of github.com:jjromannet/IWI.git