Merged version 2 branch into master
Adding merged cabal file with bumped version