Merge pull request #49 from amychiu/amy/development2

fixed user defaults