Merge branch 'master' into gh-pages
Mirrors Pull Request #4

https://github.com/TedGoas/Cerberus/pull/4
Merge branch 'gh-pages'