Merged simplecov branch into master branch

 * Merged simplecov branch into master branch.