Merge pull request #58 from daymun/master

fix nil layout