Initial commit
Merge remote branch 'vojta/master'
test, changes in commented parts only