White space fix and close issue #6