make the dildo a bit more complex
Merge branch 'master' of github.com:dsiefert/test