enhancement: #106