Added missing argument params (closes #188)
Removed some redundant uses of MUST + tidy
Fixed duplicate def
Merge pull request #190 from marcoscaceres/editorial

Editorial fixes