Made a test case for parse problem
Enhance singleton synchronization
Merge branch 'master' into catarina