feature set 1 changes
Merge pull request #1 from NTSmalley/develop

feature set 1 changes