update to documentation, few minor fixes to code
fixed documentation conflict
Merge branch 'master' of https://github.com/ferhanture/Ivory into working