Some Changes
Merge remote-tracking branch 'origin/master' into Alexey
Updated Business Logic
Updated Business Logic