Merge pull request #14 from cuberis/dev

Dev
Merge pull request #15 from cuberis/polish

Merge pull request #14 from cuberis/dev