Merge pull request #652 from nsendetzky/master

Implements decorator for hiding delivery/payment options based on the country code