Started adding options from Martin Brochhaus Pycon APAC 2012 presentation