Further Code Changes - Thanks MrData!

https://bitcointalk.org/index.php?topic=259764.msg6757311#msg6757311