Adding protection around parameters, for reserved words of Scala.
Closes #71
Merge remote-tracking branch 'refs/remotes/origin/master'