Merge branch 'XhmikosR-master'