Fix replies
Last minute changes are good
Merge pull request #46 from Zehhu/changes

Changes