Added some stuff to master