Use next tick

closes #37
closes #35