Merge pull request #2 from techdivision/master

Remerging with larsroettig
Refactored status messags
Merge pull request #9 from wagnert/master

Refactored status messags