I will add this code in #116 after git rebasing