fix bug merging
Merge pull request #69 from dehaes/master

Fix bug merging