Fixed bug in message construction
Merge branch 'master' of https://github.com/asweingarten/TSK