issue #3

Fixed issue #3 and add some fixes with quotes.