new feature
Merge pull request #7 from nagat/everyones_work

new feature