closes #370