Merge pull request #105 from nps-tug/dev

All v1.5 milestone issues are closed