just small fix.
small fixeds.
some fix.
Merge pull request #14 from DeathKing/master

Fixed again.