Moved calculation method to Rental
Update doc
Merging 02 branch