- fixes #31 issue
- closes #34 issue