fixed all crashes with the new completion block
Merge pull request #151 from mRs-/master_mrs

fixed all crashes with the new completion block