Adding modified files
Merge branch 'master' of https://github.com/jomski2009/yookore

Merging changes that have been done by Emile