Merge branches 'master' and 'code_for_paper'
Fixed accidental merge of README
Proper license file added