Merge branches 'name_flag' and 'master'
Merge branch 'master' of https://github.com/joeandaverde/bottles
Reduced dependency on Math.sqrt