Merge pull request #50 from Nominalista/dev

Thanks!
Next renaming