fixed formatting and typos
fix merge
Merge pull request #8 from emccode/updatets

fixed formatting and typos