Merge pull request #147 from todashuta/master

Removed unnecessary code.
Improve status line