fixed merge errors
Merge pull request #282 from wikibook/master

fixed merge errors