wildcard handling based on OF-1.0.1

wildcards do not have to be set on certain conditions
fixes #2
CHANGES updated due bugfix #2
cleanup comments and deprecated code
Merge branch 'devel-0.4' into devel-0.5