some adjustments
unit test added
v0.8 preparation
 some corrections