remvoe emtpy
Merge remote-tracking branch 'origin/Dev-Dave' into Development