Resolving auto-layout issues
Merge pull request #9 from filipealva/auto-layout-issues

Resolving auto-layout issues