update method implementation
code cleaning
Merge pull request #2 from emx91/master

update implementation with single method