closes #46 #47