User Definition

Merged Sid Sijbrandij requested to merge user-definition into master