[IMP] Improve code and readme file.