Resetting some changes
Merge branch 'edwards' of https://github.com/CyCoreSystems/transport into edwards