New Version

some improvement and new functionalities