Shaw02 Merge pull request #33 from Shaw02/feature/SupportNSF2_#7