Suppressed duplicate code
Merge pull request #1 from tranca/master

Suppressed duplicate code