fixes #4
fixes #3
closes #2