jbouny Migration to r72, clean code

Latest commit 930c096

Sep 29, 2015