Test, comment, refactoring
Merge pull request #54 from kainby/master

Merging HyeIn Code with Master Branch