Updates
updates with feature mix and updated feature code
Merge branch 'master' of https://github.com/kavehtaghipour/spamnomore