Merge branch 'master' of github.com:poolifier/poolifier into waittime