Changes resulting from trying WebStorm as IDE
Merge remote-tracking branch 'origin/master'