Code cleanup
Added private message handling
Merge pull request #37 from Hydrothermal/dev

Dev