Merge pull request #3 from firewing1/master

Minor changes for better interopability
Merge branch 'master' of https://github.com/alanly/thedrop into develop
Merge remote-tracking branch 'upstream/master' into feature/stripe