nicer
Merge branch 'master' into parsekit

Conflicts:
	Sources/MODMaxKey.m
	Sources/MODMinKey.m