recursive merge
Merge pull request #14 from iamalarner/recursive-merge

recursive merge