Merge pull request #1 from lisavogtsf/master

pull master changes into gh-pages
Merge pull request #2 from lisavogtsf/gh-pages

Merge pull request #2 from lisavogtsf/master