Update from jenkie's copy

17-Apr-2014 update from jenkie.