Fixed Bugs
Merge remote-tracking branch 'origin/AustinBranch' into Trung