Fixed issue #161
Merge pull request #162 from cyrilchandelier/master

Fixed issue #161