Tim's Edit
Merge pull request #2 from TPRI/master

Tim's Edit