some changes
Merge branch 'master' of https://github.com/alexsuse/elastic_conv_net