Updated to new version.. New features and fixes added