updated
Merge branch 'master' of https://github.com/pczech/docs.git