Better implementation of gh-693.
Better implementation of gh-693.

hayesgm/brunch,lalomartins/brunch,Flaise/brunch,ondreian/brunch,PeterDaveHello/brunch,brunch/brunch,justinwoo/brunch,hellyeahllc/brunch,rlugojr/brunch,kidaa/brunch