update armature

merge latest armature to develop branch