Updated files

Updated files as of 28-01-2014