Merge pull request #4 from TradeFairs/master

OK