Merge pull request #3 from jimwhitfield/master

reorg