re-writing beginning of organizing section
merged upstream
Merge pull request #211 from AJRenold/master

re-writing beginning of organizing section