Added functionality to force attributes onto an entity
Merge branch 'release/v0.8.4'