Fix screwed up version
test
Merge branch 'Kt' into Joaquin
commented code
removed some nonsense marks