minor cleanup
Merge remote-tracking branch 'origin/master'
made the app work better when there's no internet connection