fix for SyntaxError: cannot return a value from a constructor
Merge branch 'release-v0.7'