Fixing Layout generator ref #15
Merge pull request #17 from rek/master

Layout generator - fixes #15