komit
fixes according comments
commit
commit8
commit