Added Message Counter

Closes #51 needs testing