Extra notes
Merge pull request #6 from tony/feature/modularize

Extra notes