Merge pull request #4 from diorcety-master