Resolving underscore to 1.5.2.
Merge branch 'hotfix/0.3.3'