Merge pull request #1 from ysl3000/master

Pushed bugfixes to 1.8_R_1 Branch