*switch log method to public so that it can be passed to other methods with Array($this, 'log');
Merge origin/master