Added new Features and minor fixes