Removed class restriction and orphan instances
Merge remote-tracking branch 'origin/master'