Pull in commit:2fd5910 from crowdmob, and merge in my fix for #2.  Closes #1