fix issue with simplecov setup
Merge branch 'dev'