Adds complete callbacks an onComplete()
Merge branch 'complete_callbacks'