Merge branch 'development_0.9.3/2.2.1' of gitlab.surrey.ac.uk:ri0005/binary_c-python into development_0.9.3/2.2.1