Fix issue #19 Thanks @quanlong