replaceAll replaced with a simple function
Merge branch 'master' into beta
better cover finding code
Merge branch 'master' into beta