#40 refresh button now also does local
Merge branch 'development'