Fix for #7 (by kevinchuangtw)