Merge pull request #1 from drewbo/master

merging master updates to gh-pages