Small fixes
Merge branch 'master' of github.com:w7cook/AoPL