Merge pull request #469 from ndawe/master

[MRG] get_limits and wait improvements