Made use of isObject helper function per feedback.
Merge branch 'master' into dist
Updated dist files.