Add new layout and core.
Merge pull request #292 from gsn/master

Merged from beta.