Implemented message expansion

Fixed #91