Merged changes from issues into master, updated cabal file to be compatible with latest libraries