Added support for poor man's perspectives.
Merge remote-tracking branch 'origin/master'