fixed: #19 and enchancement: #48