Resolves #1291
Merge pull request #1292 from kyungmin/sake-bomb-phase3

Sake bomb changes