merging pr #36