AP11-175 Bug fixing
Merge branch 'master' of github.com:IntersectAustralia/ap11_samifier