Refactored code in BlastModel update
Merge remote-tracking branch 'origin/master' into gitcompile