closes #342