merge pull req. #187