Merge pull request #14 from cuberis/dev

Dev