1. added property file
2. some bug fix