- merged upstream
- fixed #1