Final version for delivery

This is the final version for delivery, it includes the final code as
well as the final documentation