Updated version for bug fixes