Merge pull request #15 from i-c0112/master

layout optimization