nla/banjo — pull request #604 by AaronCMuller (2014-08-01 01:35:55+00:00)
Title: Fix issues for  DSC-389

Also reformat some code to make it consistant within the file. (hence all the weird changes).