Adding code.
Adding base code.
Merge branch 'master' into gh-pages