Cleaned some things up
Merging
Merge branch 'master' of github.com:dferrer/Pool
merging
Now checking for obstructions