updated with recent revisions from github pages repo