Allow validator to use context as object
Revert alignment
Only set object as context if it is from the right type
Merge pull request #406 from bakura10/fix-context-unique

Fix context unique