Issue 64 and Issue 64 fixes.