Intranda 2013 11

This is a pull request for changes by intranda GmbH in November.