Fix #587
Merge branch 'master' of github.com:paf31/purescript