fixing issue #21, conference calls + editorial changes
Merge pull request #22 from zolkis/gh-pages

handling issue #21
fixed merge conflict