Merge pull request #1 from mattjw/master

Updating to mattjw:master.
Merge needed.

Merge branch 'master' of github.com:nsds/LMTF-Tools