version 0.9.4 (changes by JasonX, torminen)