Fix computed member expressions
Fix module names conflict with local variables
Merge remote-tracking branch 'wd/master'

Conflicts:
	index.js