Merge pull request #48 from chrqls/dev

[#4] Managing large and x-large format