Improved: function design (dsl-like)
Improved: more function design (dsl-like)
Fixed: missing function
Added: 'or', 'or' specs