integrate changes from PR #40


 Sent using [Gush](https://github.com/gushphp/gush)