Update and Receive status correctly
Merge pull request #15 from paulmach/master

Update and Receive status correctly