Merge branch 'master' of https://github.com/aimed/php-bone

Conflicts:
README.md
..
..