Merge pull request #14 from yaworsw/master

Changed how messages are retrived