fixed crashes
Merge remote-tracking branch 'FlipBook/master'