Added new features.
Updated description