Merge fixes made by Crisu83 and others on Crisu83/yiistrap repo

Tony, I've merged Crisu83 and others changes on Crisu83/yiistrap repo