fix some issue #7 and fix fome include path.