Merge pull request #5 from iru-/master

Type support in layout fields