closes #319