Added numpy save and plot option