Merge pull request #2 from bmcloughlin/master

Updating Organization code from my branch