4 space indent, parentheses on function and object literals, don't use 'unless'
Merge remote branch 'stefano/master'