implemented / closed #55