New Feature Added

Also Minor Bug Fixes