Merged Layout support. Fixed #11