Testing sonar
Merge branch 'wf2' of https://github.com/cerathe/maslab-2014 into wf2