merge pull #190