Dancerfly

As per request, a pull request for the dancerfly branch