formatting
Merge branch 'matt/python' into python-highlevel