new version (PHP 5.5 compatible)
Merge branch 'master' of https://github.com/padorange/ola