Merge pull request #67 from BillsJ/master

final chapter I changes