merged pr #49