Fixes Issue #3 and adds settings for session options