adding simplecov
merge from master