Improved parsing a bit.
Merge branch 'master' of github.com:jfly/TornadoTracker