Allow special characters including $ signs

Addresses #36