wohoo Dagur er awesome
Merge branch 'master-gardyna'
becouse Dagur is awesome