Merge pull request #2 from bmcloughlin/master

Updating Organization code from my branch
Merge pull request #3 from Version1Software/master

Merge pull request #2 from bmcloughlin/master