Prettified and fixed bug in combine
Another merge with master