Bug Report, Error fixed
Merge branch 'gwan'