Update 03.08.2013 and some fixes