Added session_dir setting
Replacing tabs with spaces