Fixed Issue #21 - Adding in quotes