IMPORTANT! BUG FIX!
Merge pull request #19 from snowzjx/branch_snowzjx

IMPORTANT! BUG FIX!