Working version
Merged (probably not right
Merge branch 'master' of https://github.com/mar-one/machine-trans-shared-task
Fixed bugs from merging