changes from Pull Req #17
revert Cp Reading code to the one from Sven Mag #18