First set of changes from Christian from 07/03/2013
Second set of changes by Christian from 07/03/2013. So many useless words -.-