Close #11

Also fixed bug with selection of product.