upgraded version to 2.10 and fixed errors from Pull Request #61