Merge ridoo's changes in the master branch