Fixed #10
Modified docs, etc.