Merge pull request #77 from johanjusits/branch-1

more xlarge stuff