Fixes gh-1 (with previous commits)
Fixes gh-6