Add additional merge methods
Merge branch 'techdivision'
Raise bug/feature version to 0.1.1
Merge pull request #6 from wagnert/master

Add additional merge methods