First feature completed.
Merge pull request #1 from yflement/feature

First feature completed.