Improve Haskeline support (Fixes #30)