Merge request 23, thank you @zyyang