updated to the latest version with new features and bugs fixed