merge pull request from echampet