Merge pull request #37 from Bersh/master

Check for isFinishing flag before showing dialog