Branch/inventory

@eric79 Please review.