Auto-layout done
Merge pull request #1 from grackend/master

Auto-layout done