fixes on cob3-7
merge
Merge pull request #2 from ipa-cob3-7/merging_elmo

fixes on cob3-7