Merge pull request #94 from plaprade/master

Fixing cabal file
JSON fix
Merge pull request #95 from xenog/json-fix

JSON fix
Updating cabal dependencies