Fixes with session
Merge remote-tracking branch 'origin/master'
Added Preferences
Added Preferences