fixed crash on first run due to nil in NSUserDefaults value
Merge remote-tracking branch 'origin/master'
fixed crash on first run due to nil in NSUserDefaults value