closes #50
closes #50