span/Team05 — pull request #76 by demonicblue (2012-10-10 13:48:22+00:00)
Title: Hotfixes

Merging hotfixes