Added Hunter's changes
Merge branch 'master' of github.com:WeAreMocha/Droplet