Merge pull request #4 from thesamesam/develop