Fixed bug #13
Fixed whitespace for easier diffs
Updated bug #13