merge
Merge branch 'master' of github.com:dferrer/Pool
merge
Updating things