Merge pull request #26 from Nolux/dev

Dev