updated to support new layout
Merge branch 'master' of github.com:Sendhub/sh_util