Switched from localstorage to Storage
Merge pull request #17 from recked/master

Switched from localstorage to Storage + modified conditional