Extra commenting plus general reorganization
Merge pull request #4 from cfv1984/development

Extra commenting plus general reorganization