Added new features.
Bug fixes.