Merging back from ch/open
Satisfying jshint