closes#33