Merge pull request #62 from ifreecarve/master

re-apply isNotNil patch that was lost in formatting shuffle