Added most recent modifications

Modifications from 14.01.2014