Cleanining up features
Merge pull request #13 from taiyode/anchen

Cleanining up features