#23 update to jargon master