closes #47, closes # 190