Improving comment and reordiring the code.
Merge pull request #15 from thinrope/master

Improving comment and reordiring the code.