Issue #8 - Fixed saving to local Storage process