Made Haskell files work on both linux and windows
Merge remote-tracking branch 'origin/master'