fix bad merge
Merge pull request #27 from jDramaix/jd_bad_merge

fix bad merge