merge darinmorrison/haskell