Merged all changes 06.04.2013