Simplify define()
Merge branch 'master' into wsh