Updated version after pull requests