Merge pull request #14 from yoshimalucky/feature-refactor

Refactored some codes and solved conflicts!
Fixed some minor bags. Build scceeded.