Fixed Issue #76
Added Save preference