TP syncing again
Merge pull request #5 from TimPaisley/master

TP syncing again