Merge pull request #2 from Feneric/master

First Pass at E17 / E19 Dependency Fixing, Updated ePad