Ajusts
Merge branch 'develop' of github.com:brunojensen/remoting into develop