Remove duplicate code.
Merge pull request #6 from bartschuller/master

Remove duplicate code.