修复两个大bug。
Merge pull request #4 from flyinhigh/master

Pulled at 2013-07-22 23:12:51 by kpm