Issue #32
Merge branch 'master' of github.com:tjworks/docs