wait til next frame to callback in all cases (resolves #7)

/cc @ianstormtaylor