prepare merge nico
Merge branch 'development' of github.com:sbianchi/wira into development