Added JP36
Issue #5: Attribute modifiers remain when weapon is switched
Added M308