Version 1.3.6: More bugfixes