-Adding Jeff's changes
Communication now correctly setup
Merge pull request #5 from ReanoD/master

Jeff's changes + communication