Changed over to the module design pattern.
Merge branch 'master' into gh-pages