Nesurion/Disk-Buttler — pull request #4 by ZeissS (2012-07-16 21:44:25+00:00)
Title: Update master

Mainly formatting fixes.