Merge pull request #1 from DaveDavenport/gh-pages

merged upstream changes
small change
Merge pull request #75 from carnager/gh-pages

Made features an actual list