Revise key exchange #52, should be working now

Signed-off-by: Sven Haardiek <Sven@Haardiek.de>
Code documentation and Code Cleanup, #53

Signed-off-by: Sven Haardiek <Sven@Haardiek.de>