Merge pull request #60 from gremid/fix/build-and-dependencies

Fixes build and dependencies