Added a little on inline documentation
Fixing a little bug with merging