Merge ridoo's changes in the develop branch