minor changes
Merge branch 'master' of github.com:jdoppler/exceptional-points
fixed merge conflict