added new features.
enjoy!