fix cyclic require, redefined methods and other warnings
Merge pull request #13 from hollow/master

fix cyclic require, redefined methods and other warnings