Fixed #2299: Integrated armature module

Fixed #2299: Integrated armature module