Added stuff
Fixed merge issue and added documentation.