Fixed Hot Bug
Merge branch 'master' into iss01