Basic layouts support. Go from var_dump-ing output to something actually useful.
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md