.
Merge pull request #4 from Aerolab/gh-pages

A couple extra changes