replaceAll replaced with a simple function
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2
better cover finding code
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2