prototype
improve test
Merge pull request #1 from itsPG/dev

Dev