version 1.5 source code merge with base