nla/banjo — pull request #371 by huwr (2014-02-18 04:24:21+00:00)
Title: rm sonar code warnings

@JonathanShaw these are some slight changes you may like to add in.