Fix dependency with layout.
Merge pull request #5 from fattouchsquall/develop

Fix dependency with layout.