closes #360