FINALLY, fixed dependency/requires issues
Merge pull request #3 from uberbrodt/master

FINALLY, fixed dependency/requires issues