Merge pull request #2 from lisavogtsf/master

pull master changes into gh-pages