Bug fix: not adding parameter if is null, Closes #17