update for appcode 3.1
Merge