Actually added the additional behavior described in the last commit. For Ticket#110.