Port for Magento 2 DEV BETA

I've changed few files in your fork for compatibility with Magento 2 DEV BETA