Bugfix: Prevent admin execution, and non HTML documents.
Nested display support
Merge branch 'staging'

Conflicts:
	README.md