Optional c s

Fixed the Issues brought up in Issue #82