Merge pull request #1 from Jcrowley/master

Pull to gh pages