#1028 PR merge and code improvements
#1028 PR merge and code improvements

notzippy/revel,runner-mei/revel,revel/revel,birkirb/revel,revel/revel,notzippy/revel,birkirb/revel,notzippy/revel,birkirb/revel,runner-mei/revel