Merge pull request #1 from shrimpza/develop

merge develop to master
allow any origin, maybe make this configurable later