FIX: Minor fix
ENH: Better timing control
Merge pull request #204 from Eric89GXL/minor-fixes

Minor fixes