Merge pull request #43 from philburk/ticket_39_qm