Changed minimum version and minor bug fixes
merged