#62 Merged from 1.0-release branch after releasing 1.0.1