re-org
Merge pull request #67 from ahebert/master

re-org