Merge pull request #420 from msimerson/master

SPF: bug fix, adding missing parens