removed duplicate code
Merge pull request #1 from r4jin/master

removed duplicate code