Fix merge mode
Update version
Merge pull request #14 from winebarrel/v0.3.4

V0.3.4