manually merge pr #74 Thanks @gadicc