Style update
Merge branch 'dev' into feature/xmlrpc_handling