closes #48
closes #481