GH103- Port Save Mechanism

issue #103