Changed to use jacoco for sonar
Merge remote-tracking branch 'origin/master'
Fixes #13