Merged Version 21.01.2014