Fixes and closes PR #56.