cleaning up header management
test fixing and code refactoring
Merge branch 'master' of github.com:zinic/pyrox