merge from devvel & modified copyright info -dye