Re-factor event command string generation.
Merge pull request #25 from MarianoGnu/master

Re-factor event command string generation.