closes #48 #49