Updated Version from ZHAW SVN