Fixed autolayout issues
Merge pull request #13 from ateich/master

Fixed autolayout issues