Rolled dependencies
Fixed issue #10