Fixed merge implementation
Merge pull request #3 from ppola/master

Fixed merge implementation