crushed bug
Merge pull request #15 from ranleung/master

crushed bug