added merge ability
Merge pull request #5 from jo/merge_support

added merge ability