Merge pull request #8 from dubdabasoduba/develop

Master setup