fixed #41
closes #39