Fixed Bug
Merge branch 'master' into r2