TA feedback included
Merge pull request #109 from fractor/gh-pages

TA feedback included