Merge branch 'adamd10d' of https://github.com/adamd10d/dolphin

I am really confused right now. Halp.