BK-1196 - Implement multiple save options

Fixed bugs described on pull request #193