btw error fixing
Merge pull request #46 from cassiopaia/master

btw error fixing