Merge pull request #161 from gianebao/3.3

added layout module