Code

merge inline patch from Jimmy