Add feature-1 #7
Merge pull request #8 from stmllr/feature-1

Add feature-1 #7