Merge pull request #1 from VQComms/parameter-type-fixes

Added some guarding for parameters