Merge branch 'gh-pages' into dev
General updates and stubs for generic functions.
Merge pull request #22 from freshprogrammer/dev

Dev