Merge pull request #25 from mikeplavsky/master

Fixed while hanging in read_message
naming
merge
fix #22