Merge pull request #26 from xhunterx89/master

layout