merge #4

inventory fix