DRY
Merge pull request #18 from mortice/best-branch-ever

DRY