Change file save delimiter to + rather than _
Merge branch 'cassidoo-patch-1'