Removing the last root references

Get ready for more merge spam...
Merge pull request #33 from flashii/master

Removing the last root references