Merge pull request #13 from mreinstein/master

documentation improvements
add self_defending param to documentation
small typo
fixed merge conflicts and several typos