V1.6.4, performance fixes #8 fixes #9