Updated features code and BOW

Adding updated features with Harish and Rakesh Change