Merge branch 'develop' of https://github.com/elliotte/WazaReport into develop