pull request from @Zoloogg merged. close #5