#32 additional commit...

I have made some mistakes.