merge code4craft branch