Fixed possible segfault on contol behaviour change. This is a mid-term solution until we have collected all needs by the effect branch and are able to optimize this out.
removed unrelated changes
Merge pull request #46 from daschuer/atomic-co4

Fixed possible segfault on contol behaviour change.