pt update
Merge pull request #206 from MichaelKohler/ptfinish

pt update
Merge branch 'master' into gh-pages