Fixed merge implementation
Merge pull request #4 from pennydesigns/master

Fixed merge implementation