Pull request for #3

Both run and handle methods have been changed to support #3.