Merge pull request #26 from chrqls/dev

Dev