Adjust some static functions and dev version 1.3.1.1