Now including most dependencies Fixes #36 and #35