Added a couple of hooks ( closes #14 )