fix feature1
Revert "Revert "Merge pull request #37 from saml/feature1""

This reverts commit a21756cac04ca8085ac04c378f8dff23133dc9e0.
Merge branch 'feature1-again'