Development 1.6.6 Pull #2

Damn that went horribly wrong! Lets try this again!