I merged #141, feel free to use it here.