Protection from external 'undefined'
Merge pull request #184 from oleg8sh/patch-1

Protection from external 'undefined'
Merge remote-tracking branch 'origin/master' into next