fixed: #70, enchancement: #58
fixed: #70, enchancement: #58