Merge pull request #17 from University-of-Auckland/develop-more-fixes

More fixes from Vlad
Merge branch 'aaf-develop' into code-develop