Merge pull request #3 from MadeByAnalogue/master

merge master with dev