added rake support (removed thor)