Address #8 in README, and part of #4