Merge pull request #238 from bobsayshilol/master

Online->offline port (again)