Fixed #1

Fixed whitespace things and also fixed #1

Fixed #1, for rebasing