fix issue #18
Merge remote-tracking branch 'upstream/master'
Merge pull request #19 from poupotte/master

Fix issue #18