Proper implementation of the rule attribute context handling
Merge branch 'master' of github.com:djowel/spirit_x3