Update documentation
new changes
Merge branch 'master' of https://github.com/greven/greven.github.com