Quotes

Pull request for fixing quoted main parameters, including unit test.