Removed code duplication
Merge pull request #64 from stof/remove_duplication

Removed code duplication