Merge pull request #1 from zlargon/develop

fix bug, and compile warning
remove log.c