fixed bug with merge function
Merge pull request #26 from gpratt/master

fixed bug with merge function