Added controlling entity marker. Fixes #15