Merge pull request #1 from zeroasterisk/master

Catch-up
Fix for silent failure seen in zeroasterisk/MeteorRider#7
Merge pull request #29 from hiddentao/master

Fix for silent failure when loading in PhoneGap