Merge pull request #328 from ntrel/infobar-save