fixes #36
closes #27