slight fix
Merge branch 'tzuo' of https://github.com/tzuohann/MASTER into tzuo
try to fix bug
bugfix in initFeatures