ADDED custom user defines. CLOSES #65