updated functionality
Merge pull request #22 from bitaruka/master

updated functionality