added the passw back in
Merge pull request #1 from infrequent/master

Updating mod command
Refectored message generation to keep code DRY
Merge pull request #2 from cybrox/message-refactoring

Refectored message generation to keep code DRY
made cybrox's code work
made cybrox's code work + self.
Merge pull request #2 from HyperWind/master

Updating fork