Pull in changes from @k2052

@sshaw version wasn't working for me due to issue with `input_div`.