Merge pull request #64 from johanjusits/branch-1

fixed reset to include sharedprefs