updated set and get logic
Merge remote-tracking branch 'origin/master'