thecelloman Merge branch 'fogimp' into ceport