initial commit
Merge pull request #1 from clavien/newfeature

new feature