Possible fixes for #35
Looks like #21 is fixed.
Merge branch 'master' of github.com:jamesread/upsilon