Allow special characters including $ signs

Addressing #36