Commiting again

For some reason only part of the files were commited on the previous
commit. See the previous commit for more information