Big_Bug_Fix
Merge remote-tracking branch 'origin/master' into big_bug_fix
Merge pull request #86 from alexung/big_bug_fix

Big bug fix