Merge pull request #1 from jhaynie/master

Code cleanup preparing for initial release 1.0.0
trigger a travis build
fixed cyclic dependency issue