*
Merge remote-tracking branch 'josef/master'
commented code and cleaned 1