Added n-gram support, new sample for testing