Issue #12 sonar