Commit by 09.04.2014
Night commit by 09.04.2014