slight changes and fixed a whitespace bug (#18)