Merge pull request #2 from mlc-training/master

OK
Merge pull request #3 from TradeFairs/master

Merge pull request #2 from mlc-training/master