Merge with Schweigi:develop 05/06/2014