Testing stuff (new wifi connection)
Merge origin/master