Added assembly to create dist.zip file
Added null check
Merge remote-tracking branch 'origin/master'