Merge pull request #24 from arthurbenemann/dev

Dev